Skip to content

Update Block a user form#37359

Merged
wxiaoguang merged 5 commits intogo-gitea:mainfrom
PineBale:patch-blockeduserspost
Apr 22, 2026
Merged

Update Block a user form#37359
wxiaoguang merged 5 commits intogo-gitea:mainfrom
PineBale:patch-blockeduserspost

Conversation

@PineBale
Copy link
Copy Markdown
Contributor

@PineBale PineBale commented Apr 22, 2026 •
edited
Loading

Use the new "form-fetch-action" for better user experience, and use JSONError to show error messages.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 22, 2026
@wxiaoguang

This comment was marked as outdated.

Sign in to view
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026

By the way, single ctx.Flash.Error is not right

@wxiaoguang wxiaoguang marked this pull request as draft April 22, 2026 06:36
@PineBale

This comment was marked as outdated.

Sign in to view
@PineBale

This comment was marked as outdated.

Sign in to view
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026 •
edited
Loading

By the way, single ctx.Flash.Error is not right

The other parts were left untouched 😕

No, it can't be right, it will only show you a blank page.

I don't think you need such change anymore after #37334

ErrUserNotExist ....

func (err ErrUserNotExist) Unwrap() error {
	return util.ErrNotExist
}

@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026

By the way, for better user experience, you need to use the new "form-fetch-action" framework, and use JSONError to show error messages.

@PineBale

This comment was marked as outdated.

Sign in to view
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026 •
edited
Loading

It just happens to work in this case. It will definitely cause bugs in the future.

Do not do that. If you are not that familiar with the code base, just trust me.

I maintained most of the related code:

Details image
image
image

@PineBale

This comment was marked as resolved.

Sign in to view
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026

Also I didn't find the Unwrap() being used anywhere 😅

It is Golang's error framework

@PineBale PineBale force-pushed the patch-blockeduserspost branch from 5f59859 to 303fc74 Compare April 22, 2026 06:56
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026

As a quick fix, I can help to rewrite it to a proper approach. Just a moment.

@PineBale
Copy link
Copy Markdown
Contributor Author

PineBale commented Apr 22, 2026

huh, just notice logErr is nil. one line patch. 🙄 will look into the form-fetch-action later

@PineBale PineBale changed the title Redirect upon trying to block a non-existent user. draft: Update Block a user form Apr 22, 2026
@PineBale PineBale changed the title draft: Update Block a user form wip: Update Block a user form Apr 22, 2026
@PineBale
Copy link
Copy Markdown
Contributor Author

PineBale commented Apr 22, 2026 •
edited
Loading

By the way, for better user experience, you need to use the new "form-fetch-action" framework, and use JSONError to show error messages.

Details image
1

@PineBale PineBale changed the title wip: Update Block a user form Update Block a user form Apr 22, 2026
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026

By the way, for better user experience, you need to use the new "form-fetch-action" framework, and use JSONError to show error messages.

Details

It is still incomplete ......

#37359 (comment)

As a quick fix, I can help to rewrite it to a proper approach. Just a moment.

We need some other fixes ahead.

wxiaoguang
wxiaoguang reviewed Apr 22, 2026
View reviewed changes
Comment thread routers/web/shared/user/block.go Outdated
@wxiaoguang wxiaoguang force-pushed the patch-blockeduserspost branch from d72bdab to 6fa7f2a Compare April 22, 2026 07:36
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Apr 22, 2026

It is clear and correct now

image

@wxiaoguang wxiaoguang marked this pull request as ready for review April 22, 2026 07:46
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 22, 2026
@wxiaoguang wxiaoguang force-pushed the patch-blockeduserspost branch from 4ad4e7b to d25fa30 Compare April 22, 2026 08:41
@wxiaoguang wxiaoguang force-pushed the patch-blockeduserspost branch from d25fa30 to 8c7018c Compare April 22, 2026 08:42
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 22, 2026
@wxiaoguang wxiaoguang merged commit 4695110 into go-gitea:main Apr 22, 2026
26 checks passed
@GiteaBot GiteaBot added this to the 1.27.0 milestone Apr 22, 2026
@lunny lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Apr 22, 2026
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 23, 2026
@zjjhot
Merge branch 'main' into mainzjj
0b1ed5f 
* main:
  fix: commit status reporting (go-gitea#37372)
  Support for Custom URI Schemes in OAuth2 Redirect URIs (go-gitea#37356)
  Fix cmd tests by mocking builtin paths (go-gitea#37369)
  chore: upgrade Go version in devcontainer image to 1.26 (go-gitea#37374)
  Fix button layout shift when collapsing file tree in editor (go-gitea#37363)
  Update `Block a user` form (go-gitea#37359)
  Remove IsValidExternalURL/IsAPIURL and use IsValidURL at call sites (go-gitea#37364)
silverwind added a commit to silverwind/gitea that referenced this pull request Apr 23, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into acticons
1f03083 
* origin/main: (32 commits)
  fix: commit status reporting (go-gitea#37372)
  Support for Custom URI Schemes in OAuth2 Redirect URIs (go-gitea#37356)
  Fix cmd tests by mocking builtin paths (go-gitea#37369)
  chore: upgrade Go version in devcontainer image to 1.26 (go-gitea#37374)
  Fix button layout shift when collapsing file tree in editor (go-gitea#37363)
  Update `Block a user` form (go-gitea#37359)
  Remove IsValidExternalURL/IsAPIURL and use IsValidURL at call sites (go-gitea#37364)
  Add URL to `Learn more about blocking a user` (go-gitea#37355)
  fix: use TriggerEvent instead of Event in workflow runs API response for scheduled runs (go-gitea#37288)
  Add event.schedule context for schedule actions task (go-gitea#37320)
  Fix typos (go-gitea#37346)
  Fix an issue where changing an organization’s visibility caused problems when users had forked its repositories. (go-gitea#37324)
  Fail vite build on rolldown warnings via NODE_ENV=test (go-gitea#37270)
  Use modern "git update-index --cacheinfo" syntax to support more file names (go-gitea#37338)
  Fix URL related escaping for oauth2 (go-gitea#37334)
  When the requested arch rpm is missing fall back to noarch (go-gitea#37236)
  Fix `relative-time` error and improve global error handler (go-gitea#37241)
  Enhance styling in actions page (go-gitea#37323)
  fix(oauth): Error on auth sources with spaces (go-gitea#37327)
  Fix actions concurrency groups cross-branch leak (go-gitea#37311)
  ...

# Conflicts:
#	services/actions/commit_status.go
silverwind added a commit to silverwind/gitea that referenced this pull request Apr 23, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into refpop
d0e9881 
* origin/main: (204 commits)
  fix: commit status reporting (go-gitea#37372)
  Support for Custom URI Schemes in OAuth2 Redirect URIs (go-gitea#37356)
  Fix cmd tests by mocking builtin paths (go-gitea#37369)
  chore: upgrade Go version in devcontainer image to 1.26 (go-gitea#37374)
  Fix button layout shift when collapsing file tree in editor (go-gitea#37363)
  Update `Block a user` form (go-gitea#37359)
  Remove IsValidExternalURL/IsAPIURL and use IsValidURL at call sites (go-gitea#37364)
  Add URL to `Learn more about blocking a user` (go-gitea#37355)
  fix: use TriggerEvent instead of Event in workflow runs API response for scheduled runs (go-gitea#37288)
  Add event.schedule context for schedule actions task (go-gitea#37320)
  Fix typos (go-gitea#37346)
  Fix an issue where changing an organization’s visibility caused problems when users had forked its repositories. (go-gitea#37324)
  Fail vite build on rolldown warnings via NODE_ENV=test (go-gitea#37270)
  Use modern "git update-index --cacheinfo" syntax to support more file names (go-gitea#37338)
  Fix URL related escaping for oauth2 (go-gitea#37334)
  When the requested arch rpm is missing fall back to noarch (go-gitea#37236)
  Fix `relative-time` error and improve global error handler (go-gitea#37241)
  Enhance styling in actions page (go-gitea#37323)
  fix(oauth): Error on auth sources with spaces (go-gitea#37327)
  Fix actions concurrency groups cross-branch leak (go-gitea#37311)
  ...

# Conflicts:
#	web_src/js/index-domready.ts
#	web_src/js/markup/content.ts
#	web_src/js/markup/refissue.ts
silverwind added a commit to silverwind/gitea that referenced this pull request Apr 23, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into refpop
8944b32 
* origin/main: (204 commits)
  fix: commit status reporting (go-gitea#37372)
  Support for Custom URI Schemes in OAuth2 Redirect URIs (go-gitea#37356)
  Fix cmd tests by mocking builtin paths (go-gitea#37369)
  chore: upgrade Go version in devcontainer image to 1.26 (go-gitea#37374)
  Fix button layout shift when collapsing file tree in editor (go-gitea#37363)
  Update `Block a user` form (go-gitea#37359)
  Remove IsValidExternalURL/IsAPIURL and use IsValidURL at call sites (go-gitea#37364)
  Add URL to `Learn more about blocking a user` (go-gitea#37355)
  fix: use TriggerEvent instead of Event in workflow runs API response for scheduled runs (go-gitea#37288)
  Add event.schedule context for schedule actions task (go-gitea#37320)
  Fix typos (go-gitea#37346)
  Fix an issue where changing an organization’s visibility caused problems when users had forked its repositories. (go-gitea#37324)
  Fail vite build on rolldown warnings via NODE_ENV=test (go-gitea#37270)
  Use modern "git update-index --cacheinfo" syntax to support more file names (go-gitea#37338)
  Fix URL related escaping for oauth2 (go-gitea#37334)
  When the requested arch rpm is missing fall back to noarch (go-gitea#37236)
  Fix `relative-time` error and improve global error handler (go-gitea#37241)
  Enhance styling in actions page (go-gitea#37323)
  fix(oauth): Error on auth sources with spaces (go-gitea#37327)
  Fix actions concurrency groups cross-branch leak (go-gitea#37311)
  ...

Co-Authored-By: Claude (Opus 4.7) <noreply@anthropic.com>

# Conflicts:
#	web_src/js/index-domready.ts
#	web_src/js/markup/content.ts
#	web_src/js/markup/refissue.ts
silverwind added a commit to mohammad-rj/gitea that referenced this pull request Apr 24, 2026
@silverwind
Merge remote-tracking branch 'origin/main' into feat/websocket-migration
ec54754 
* origin/main: (127 commits)
  Refactor pull request view (1) (go-gitea#37380)
  Improve AGENTS.md (go-gitea#37382)
  Remove dead CSS (go-gitea#37376)
  Add pr-review e2e test and speed up e2e tests (go-gitea#37345)
  Drop Fomantic tab, checkbox and form patches (go-gitea#37377)
  fix: dump with default zip type produces uncompressed zip (go-gitea#37401)
  Allow fast-forward-only merge when signed commits are required (go-gitea#37335)
  Introduce `ActionRunAttempt` to represent each execution of a run (go-gitea#37119)
  Move review request functions to a standalone file (go-gitea#37358)
  Fix repo init README EOL (go-gitea#37388)
  Fix org team assignee/reviewer lookups for team member permissions (go-gitea#37365)
  Remove external service dependencies in migration tests (go-gitea#36866)
  Extend issue context popup beyond markdown content (go-gitea#36908)
  fix: commit status reporting (go-gitea#37372)
  Support for Custom URI Schemes in OAuth2 Redirect URIs (go-gitea#37356)
  Fix cmd tests by mocking builtin paths (go-gitea#37369)
  chore: upgrade Go version in devcontainer image to 1.26 (go-gitea#37374)
  Fix button layout shift when collapsing file tree in editor (go-gitea#37363)
  Update `Block a user` form (go-gitea#37359)
  Remove IsValidExternalURL/IsAPIURL and use IsValidURL at call sites (go-gitea#37364)
  ...

# Conflicts:
#	modules/eventsource/event.go
#	tests/e2e/events.test.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@bircni bircni bircni approved these changes

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/refactoring Existing code has been cleaned up. There should be no new functionality.

Projects

None yet

Milestone

1.27.0

Development

Successfully merging this pull request may close these issues.

5 participants

@PineBale @wxiaoguang @bircni @lunny @GiteaBot